[CIR][NFC] Use Op::create to create CIR operations in CIRGenBuilder #154540
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lancern
requested review from
andykaylor,
bcardosolopes,
lanza and
xlauko
as code owners
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clangir Author: Sirui Mu (Lancern) ChangesThis patch updates Full diff: https://github.com/llvm/llvm-project/pull/154540.diff 2 Files Affected:
diff --git a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
index 7836a64d5465c..3d41be7b5f438 100644
--- a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
+++ b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
@@ -63,11 +63,11 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value getConstAPInt(mlir::Location loc, mlir::Type typ,
const llvm::APInt &val) {
- return create<cir::ConstantOp>(loc, cir::IntAttr::get(typ, val));
+ return cir::ConstantOp::create(*this, loc, cir::IntAttr::get(typ, val));
}
cir::ConstantOp getConstant(mlir::Location loc, mlir::TypedAttr attr) {
- return create<cir::ConstantOp>(loc, attr);
+ return cir::ConstantOp::create(*this, loc, attr);
}
cir::ConstantOp getConstantInt(mlir::Location loc, mlir::Type ty,
@@ -119,7 +119,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
}
cir::ConstantOp getBool(bool state, mlir::Location loc) {
- return create<cir::ConstantOp>(loc, getCIRBoolAttr(state));
+ return cir::ConstantOp::create(*this, loc, getCIRBoolAttr(state));
}
cir::ConstantOp getFalse(mlir::Location loc) { return getBool(false, loc); }
cir::ConstantOp getTrue(mlir::Location loc) { return getBool(true, loc); }
@@ -144,17 +144,20 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createComplexCreate(mlir::Location loc, mlir::Value real,
mlir::Value imag) {
auto resultComplexTy = cir::ComplexType::get(real.getType());
- return create<cir::ComplexCreateOp>(loc, resultComplexTy, real, imag);
+ return cir::ComplexCreateOp::create(*this, loc, resultComplexTy, real,
+ imag);
}
mlir::Value createComplexReal(mlir::Location loc, mlir::Value operand) {
auto operandTy = mlir::cast<cir::ComplexType>(operand.getType());
- return create<cir::ComplexRealOp>(loc, operandTy.getElementType(), operand);
+ return cir::ComplexRealOp::create(*this, loc, operandTy.getElementType(),
+ operand);
}
mlir::Value createComplexImag(mlir::Location loc, mlir::Value operand) {
auto operandTy = mlir::cast<cir::ComplexType>(operand.getType());
- return create<cir::ComplexImagOp>(loc, operandTy.getElementType(), operand);
+ return cir::ComplexImagOp::create(*this, loc, operandTy.getElementType(),
+ operand);
}
cir::LoadOp createLoad(mlir::Location loc, mlir::Value ptr,
@@ -172,7 +175,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
}
mlir::Value createNot(mlir::Value value) {
- return create<cir::UnaryOp>(value.getLoc(), value.getType(),
+ return cir::UnaryOp::create(*this, value.getLoc(), value.getType(),
cir::UnaryOpKind::Not, value);
}
@@ -181,7 +184,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Location loc,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> condBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> bodyBuilder) {
- return create<cir::DoWhileOp>(loc, condBuilder, bodyBuilder);
+ return cir::DoWhileOp::create(*this, loc, condBuilder, bodyBuilder);
}
/// Create a while operation.
@@ -189,7 +192,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Location loc,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> condBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> bodyBuilder) {
- return create<cir::WhileOp>(loc, condBuilder, bodyBuilder);
+ return cir::WhileOp::create(*this, loc, condBuilder, bodyBuilder);
}
/// Create a for operation.
@@ -198,22 +201,23 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> condBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> bodyBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> stepBuilder) {
- return create<cir::ForOp>(loc, condBuilder, bodyBuilder, stepBuilder);
+ return cir::ForOp::create(*this, loc, condBuilder, bodyBuilder,
+ stepBuilder);
}
/// Create a break operation.
cir::BreakOp createBreak(mlir::Location loc) {
- return create<cir::BreakOp>(loc);
+ return cir::BreakOp::create(*this, loc);
}
/// Create a continue operation.
cir::ContinueOp createContinue(mlir::Location loc) {
- return create<cir::ContinueOp>(loc);
+ return cir::ContinueOp::create(*this, loc);
}
mlir::Value createUnaryOp(mlir::Location loc, cir::UnaryOpKind kind,
mlir::Value operand) {
- return create<cir::UnaryOp>(loc, kind, operand);
+ return cir::UnaryOp::create(*this, loc, kind, operand);
}
mlir::TypedAttr getConstPtrAttr(mlir::Type type, int64_t value) {
@@ -223,7 +227,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createAlloca(mlir::Location loc, cir::PointerType addrType,
mlir::Type type, llvm::StringRef name,
mlir::IntegerAttr alignment) {
- return create<cir::AllocaOp>(loc, addrType, type, name, alignment);
+ return cir::AllocaOp::create(*this, loc, addrType, type, name, alignment);
}
/// Get constant address of a global variable as an MLIR attribute.
@@ -236,8 +240,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createGetGlobal(mlir::Location loc, cir::GlobalOp global) {
assert(!cir::MissingFeatures::addressSpace());
- return create<cir::GetGlobalOp>(loc, getPointerTo(global.getSymType()),
- global.getSymName());
+ return cir::GetGlobalOp::create(
+ *this, loc, getPointerTo(global.getSymType()), global.getSymName());
}
mlir::Value createGetGlobal(cir::GlobalOp global) {
@@ -246,7 +250,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::StoreOp createStore(mlir::Location loc, mlir::Value val, mlir::Value dst,
mlir::IntegerAttr align = {}) {
- return create<cir::StoreOp>(loc, val, dst, align);
+ return cir::StoreOp::create(*this, loc, val, dst, align);
}
[[nodiscard]] cir::GlobalOp createGlobal(mlir::ModuleOp mlirModule,
@@ -262,19 +266,20 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::GetMemberOp createGetMember(mlir::Location loc, mlir::Type resultTy,
mlir::Value base, llvm::StringRef name,
unsigned index) {
- return create<cir::GetMemberOp>(loc, resultTy, base, name, index);
+ return cir::GetMemberOp::create(*this, loc, resultTy, base, name, index);
}
mlir::Value createDummyValue(mlir::Location loc, mlir::Type type,
clang::CharUnits alignment) {
mlir::IntegerAttr alignmentAttr = getAlignmentAttr(alignment);
auto addr = createAlloca(loc, getPointerTo(type), type, {}, alignmentAttr);
- return create<cir::LoadOp>(loc, addr, /*isDeref=*/false, alignmentAttr);
+ return cir::LoadOp::create(*this, loc, addr, /*isDeref=*/false,
+ alignmentAttr);
}
cir::PtrStrideOp createPtrStride(mlir::Location loc, mlir::Value base,
mlir::Value stride) {
- return create<cir::PtrStrideOp>(loc, base.getType(), base, stride);
+ return cir::PtrStrideOp::create(*this, loc, base.getType(), base, stride);
}
//===--------------------------------------------------------------------===//
@@ -284,7 +289,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::CallOp createCallOp(mlir::Location loc, mlir::SymbolRefAttr callee,
mlir::Type returnType, mlir::ValueRange operands,
llvm::ArrayRef<mlir::NamedAttribute> attrs = {}) {
- auto op = create<cir::CallOp>(loc, callee, returnType, operands);
+ auto op = cir::CallOp::create(*this, loc, callee, returnType, operands);
op->setAttrs(attrs);
return op;
}
@@ -315,7 +320,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value src, mlir::Type newTy) {
if (newTy == src.getType())
return src;
- return create<cir::CastOp>(loc, newTy, kind, src);
+ return cir::CastOp::create(*this, loc, newTy, kind, src);
}
mlir::Value createCast(cir::CastKind kind, mlir::Value src,
@@ -365,7 +370,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createBinop(mlir::Location loc, mlir::Value lhs,
cir::BinOpKind kind, mlir::Value rhs) {
- return create<cir::BinOp>(loc, lhs.getType(), kind, lhs, rhs);
+ return cir::BinOp::create(*this, loc, lhs.getType(), kind, lhs, rhs);
}
mlir::Value createLowBitsSet(mlir::Location loc, unsigned size,
@@ -387,8 +392,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value trueValue, mlir::Value falseValue) {
assert(trueValue.getType() == falseValue.getType() &&
"trueValue and falseValue should have the same type");
- return create<cir::SelectOp>(loc, trueValue.getType(), condition, trueValue,
- falseValue);
+ return cir::SelectOp::create(*this, loc, trueValue.getType(), condition,
+ trueValue, falseValue);
}
mlir::Value createLogicalAnd(mlir::Location loc, mlir::Value lhs,
@@ -403,8 +408,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createMul(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
OverflowBehavior ob = OverflowBehavior::None) {
- auto op =
- create<cir::BinOp>(loc, lhs.getType(), cir::BinOpKind::Mul, lhs, rhs);
+ auto op = cir::BinOp::create(*this, loc, lhs.getType(), cir::BinOpKind::Mul,
+ lhs, rhs);
op.setNoUnsignedWrap(
llvm::to_underlying(ob & OverflowBehavior::NoUnsignedWrap));
op.setNoSignedWrap(
@@ -422,8 +427,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createSub(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
OverflowBehavior ob = OverflowBehavior::Saturated) {
- auto op =
- create<cir::BinOp>(loc, lhs.getType(), cir::BinOpKind::Sub, lhs, rhs);
+ auto op = cir::BinOp::create(*this, loc, lhs.getType(), cir::BinOpKind::Sub,
+ lhs, rhs);
op.setNoUnsignedWrap(
llvm::to_underlying(ob & OverflowBehavior::NoUnsignedWrap));
op.setNoSignedWrap(
@@ -444,8 +449,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createAdd(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
OverflowBehavior ob = OverflowBehavior::None) {
- auto op =
- create<cir::BinOp>(loc, lhs.getType(), cir::BinOpKind::Add, lhs, rhs);
+ auto op = cir::BinOp::create(*this, loc, lhs.getType(), cir::BinOpKind::Add,
+ lhs, rhs);
op.setNoUnsignedWrap(
llvm::to_underlying(ob & OverflowBehavior::NoUnsignedWrap));
op.setNoSignedWrap(
@@ -466,7 +471,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::CmpOp createCompare(mlir::Location loc, cir::CmpOpKind kind,
mlir::Value lhs, mlir::Value rhs) {
- return create<cir::CmpOp>(loc, getBoolTy(), kind, lhs, rhs);
+ return cir::CmpOp::create(*this, loc, getBoolTy(), kind, lhs, rhs);
}
mlir::Value createIsNaN(mlir::Location loc, mlir::Value operand) {
@@ -475,7 +480,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createShift(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
bool isShiftLeft) {
- return create<cir::ShiftOp>(loc, lhs.getType(), lhs, rhs, isShiftLeft);
+ return cir::ShiftOp::create(*this, loc, lhs.getType(), lhs, rhs,
+ isShiftLeft);
}
mlir::Value createShift(mlir::Location loc, mlir::Value lhs,
@@ -553,12 +559,12 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
/// Create a loop condition.
cir::ConditionOp createCondition(mlir::Value condition) {
- return create<cir::ConditionOp>(condition.getLoc(), condition);
+ return cir::ConditionOp::create(*this, condition.getLoc(), condition);
}
/// Create a yield operation.
cir::YieldOp createYield(mlir::Location loc, mlir::ValueRange value = {}) {
- return create<cir::YieldOp>(loc, value);
+ return cir::YieldOp::create(*this, loc, value);
}
};
diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.h b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
index f17657e4d304f..360f65e329ed6 100644
--- a/clang/lib/CIR/CodeGen/CIRGenBuilder.h
+++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
@@ -291,7 +291,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
// Creates constant nullptr for pointer type ty.
cir::ConstantOp getNullPtr(mlir::Type ty, mlir::Location loc) {
assert(!cir::MissingFeatures::targetCodeGenInfoGetNullPointer());
- return create<cir::ConstantOp>(loc, getConstPtrAttr(ty, 0));
+ return cir::ConstantOp::create(*this, loc, getConstPtrAttr(ty, 0));
}
mlir::Value createNeg(mlir::Value value) {
@@ -300,7 +300,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
// Source is a unsigned integer: first cast it to signed.
if (intTy.isUnsigned())
value = createIntCast(value, getSIntNTy(intTy.getWidth()));
- return create<cir::UnaryOp>(value.getLoc(), value.getType(),
+ return cir::UnaryOp::create(*this, value.getLoc(), value.getType(),
cir::UnaryOpKind::Minus, value);
}
@@ -312,8 +312,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
mlir::Value createFloatingCast(mlir::Value v, mlir::Type destType) {
assert(!cir::MissingFeatures::fpConstraints());
- return create<cir::CastOp>(v.getLoc(), destType, cir::CastKind::floating,
- v);
+ return cir::CastOp::create(*this, v.getLoc(), destType,
+ cir::CastKind::floating, v);
}
mlir::Value createFSub(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
@@ -321,7 +321,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Sub, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Sub, lhs, rhs);
}
mlir::Value createFAdd(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
@@ -329,21 +329,21 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Add, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Add, lhs, rhs);
}
mlir::Value createFMul(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
assert(!cir::MissingFeatures::metaDataNode());
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Mul, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Mul, lhs, rhs);
}
mlir::Value createFDiv(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
assert(!cir::MissingFeatures::metaDataNode());
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Div, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Div, lhs, rhs);
}
Address createBaseClassAddr(mlir::Location loc, Address addr,
@@ -353,8 +353,9 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
return addr;
auto ptrTy = getPointerTo(destType);
- auto baseAddr = create<cir::BaseClassAddrOp>(
- loc, ptrTy, addr.getPointer(), mlir::APInt(64, offset), assumeNotNull);
+ auto baseAddr =
+ cir::BaseClassAddrOp::create(*this, loc, ptrTy, addr.getPointer(),
+ mlir::APInt(64, offset), assumeNotNull);
return Address(baseAddr, destType, addr.getAlignment());
}
@@ -389,8 +390,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
mlir::Value createComplexRealPtr(mlir::Location loc, mlir::Value value) {
auto srcPtrTy = mlir::cast<cir::PointerType>(value.getType());
auto srcComplexTy = mlir::cast<cir::ComplexType>(srcPtrTy.getPointee());
- return create<cir::ComplexRealPtrOp>(
- loc, getPointerTo(srcComplexTy.getElementType()), value);
+ return cir::ComplexRealPtrOp::create(
+ *this, loc, getPointerTo(srcComplexTy.getElementType()), value);
}
Address createComplexRealPtr(mlir::Location loc, Address addr) {
@@ -404,8 +405,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
mlir::Value createComplexImagPtr(mlir::Location loc, mlir::Value value) {
auto srcPtrTy = mlir::cast<cir::PointerType>(value.getType());
auto srcComplexTy = mlir::cast<cir::ComplexType>(srcPtrTy.getPointee());
- return create<cir::ComplexImagPtrOp>(
- loc, getPointerTo(srcComplexTy.getElementType()), value);
+ return cir::ComplexImagPtrOp::create(
+ *this, loc, getPointerTo(srcComplexTy.getElementType()), value);
}
Address createComplexImagPtr(mlir::Location loc, Address addr) {
@@ -463,9 +464,9 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
useVolatile ? cir::IntType::get(storageType.getContext(),
info.volatileStorageSize, info.isSigned)
: storageType;
- return create<cir::SetBitfieldOp>(
- loc, resultType, dstAddr.getPointer(), storageType, src, info.name,
- info.size, offset, info.isSigned, isLvalueVolatile,
+ return cir::SetBitfieldOp::create(
+ *this, loc, resultType, dstAddr.getPointer(), storageType, src,
+ info.name, info.size, offset, info.isSigned, isLvalueVolatile,
dstAddr.getAlignment().getAsAlign().value());
}
@@ -481,7 +482,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
useVolatile ? cir::IntType::get(storageType.getContext(),
info.volatileStorageSize, info.isSigned)
: storageType;
- return create<cir::GetBitfieldOp>(loc, resultType, addr.getPointer(),
+ return cir::GetBitfieldOp::create(*this, loc, resultType, addr.getPointer(),
storageType, info.name, info.size, offset,
info.isSigned, isLvalueVolatile,
addr.getAlignment().getAsAlign().value());
|
Member
|
@llvm/pr-subscribers-clang Author: Sirui Mu (Lancern) ChangesThis patch updates Full diff: https://github.com/llvm/llvm-project/pull/154540.diff 2 Files Affected:
diff --git a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
index 7836a64d5465c..3d41be7b5f438 100644
--- a/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
+++ b/clang/include/clang/CIR/Dialect/Builder/CIRBaseBuilder.h
@@ -63,11 +63,11 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value getConstAPInt(mlir::Location loc, mlir::Type typ,
const llvm::APInt &val) {
- return create<cir::ConstantOp>(loc, cir::IntAttr::get(typ, val));
+ return cir::ConstantOp::create(*this, loc, cir::IntAttr::get(typ, val));
}
cir::ConstantOp getConstant(mlir::Location loc, mlir::TypedAttr attr) {
- return create<cir::ConstantOp>(loc, attr);
+ return cir::ConstantOp::create(*this, loc, attr);
}
cir::ConstantOp getConstantInt(mlir::Location loc, mlir::Type ty,
@@ -119,7 +119,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
}
cir::ConstantOp getBool(bool state, mlir::Location loc) {
- return create<cir::ConstantOp>(loc, getCIRBoolAttr(state));
+ return cir::ConstantOp::create(*this, loc, getCIRBoolAttr(state));
}
cir::ConstantOp getFalse(mlir::Location loc) { return getBool(false, loc); }
cir::ConstantOp getTrue(mlir::Location loc) { return getBool(true, loc); }
@@ -144,17 +144,20 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createComplexCreate(mlir::Location loc, mlir::Value real,
mlir::Value imag) {
auto resultComplexTy = cir::ComplexType::get(real.getType());
- return create<cir::ComplexCreateOp>(loc, resultComplexTy, real, imag);
+ return cir::ComplexCreateOp::create(*this, loc, resultComplexTy, real,
+ imag);
}
mlir::Value createComplexReal(mlir::Location loc, mlir::Value operand) {
auto operandTy = mlir::cast<cir::ComplexType>(operand.getType());
- return create<cir::ComplexRealOp>(loc, operandTy.getElementType(), operand);
+ return cir::ComplexRealOp::create(*this, loc, operandTy.getElementType(),
+ operand);
}
mlir::Value createComplexImag(mlir::Location loc, mlir::Value operand) {
auto operandTy = mlir::cast<cir::ComplexType>(operand.getType());
- return create<cir::ComplexImagOp>(loc, operandTy.getElementType(), operand);
+ return cir::ComplexImagOp::create(*this, loc, operandTy.getElementType(),
+ operand);
}
cir::LoadOp createLoad(mlir::Location loc, mlir::Value ptr,
@@ -172,7 +175,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
}
mlir::Value createNot(mlir::Value value) {
- return create<cir::UnaryOp>(value.getLoc(), value.getType(),
+ return cir::UnaryOp::create(*this, value.getLoc(), value.getType(),
cir::UnaryOpKind::Not, value);
}
@@ -181,7 +184,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Location loc,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> condBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> bodyBuilder) {
- return create<cir::DoWhileOp>(loc, condBuilder, bodyBuilder);
+ return cir::DoWhileOp::create(*this, loc, condBuilder, bodyBuilder);
}
/// Create a while operation.
@@ -189,7 +192,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Location loc,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> condBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> bodyBuilder) {
- return create<cir::WhileOp>(loc, condBuilder, bodyBuilder);
+ return cir::WhileOp::create(*this, loc, condBuilder, bodyBuilder);
}
/// Create a for operation.
@@ -198,22 +201,23 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> condBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> bodyBuilder,
llvm::function_ref<void(mlir::OpBuilder &, mlir::Location)> stepBuilder) {
- return create<cir::ForOp>(loc, condBuilder, bodyBuilder, stepBuilder);
+ return cir::ForOp::create(*this, loc, condBuilder, bodyBuilder,
+ stepBuilder);
}
/// Create a break operation.
cir::BreakOp createBreak(mlir::Location loc) {
- return create<cir::BreakOp>(loc);
+ return cir::BreakOp::create(*this, loc);
}
/// Create a continue operation.
cir::ContinueOp createContinue(mlir::Location loc) {
- return create<cir::ContinueOp>(loc);
+ return cir::ContinueOp::create(*this, loc);
}
mlir::Value createUnaryOp(mlir::Location loc, cir::UnaryOpKind kind,
mlir::Value operand) {
- return create<cir::UnaryOp>(loc, kind, operand);
+ return cir::UnaryOp::create(*this, loc, kind, operand);
}
mlir::TypedAttr getConstPtrAttr(mlir::Type type, int64_t value) {
@@ -223,7 +227,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createAlloca(mlir::Location loc, cir::PointerType addrType,
mlir::Type type, llvm::StringRef name,
mlir::IntegerAttr alignment) {
- return create<cir::AllocaOp>(loc, addrType, type, name, alignment);
+ return cir::AllocaOp::create(*this, loc, addrType, type, name, alignment);
}
/// Get constant address of a global variable as an MLIR attribute.
@@ -236,8 +240,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createGetGlobal(mlir::Location loc, cir::GlobalOp global) {
assert(!cir::MissingFeatures::addressSpace());
- return create<cir::GetGlobalOp>(loc, getPointerTo(global.getSymType()),
- global.getSymName());
+ return cir::GetGlobalOp::create(
+ *this, loc, getPointerTo(global.getSymType()), global.getSymName());
}
mlir::Value createGetGlobal(cir::GlobalOp global) {
@@ -246,7 +250,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::StoreOp createStore(mlir::Location loc, mlir::Value val, mlir::Value dst,
mlir::IntegerAttr align = {}) {
- return create<cir::StoreOp>(loc, val, dst, align);
+ return cir::StoreOp::create(*this, loc, val, dst, align);
}
[[nodiscard]] cir::GlobalOp createGlobal(mlir::ModuleOp mlirModule,
@@ -262,19 +266,20 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::GetMemberOp createGetMember(mlir::Location loc, mlir::Type resultTy,
mlir::Value base, llvm::StringRef name,
unsigned index) {
- return create<cir::GetMemberOp>(loc, resultTy, base, name, index);
+ return cir::GetMemberOp::create(*this, loc, resultTy, base, name, index);
}
mlir::Value createDummyValue(mlir::Location loc, mlir::Type type,
clang::CharUnits alignment) {
mlir::IntegerAttr alignmentAttr = getAlignmentAttr(alignment);
auto addr = createAlloca(loc, getPointerTo(type), type, {}, alignmentAttr);
- return create<cir::LoadOp>(loc, addr, /*isDeref=*/false, alignmentAttr);
+ return cir::LoadOp::create(*this, loc, addr, /*isDeref=*/false,
+ alignmentAttr);
}
cir::PtrStrideOp createPtrStride(mlir::Location loc, mlir::Value base,
mlir::Value stride) {
- return create<cir::PtrStrideOp>(loc, base.getType(), base, stride);
+ return cir::PtrStrideOp::create(*this, loc, base.getType(), base, stride);
}
//===--------------------------------------------------------------------===//
@@ -284,7 +289,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::CallOp createCallOp(mlir::Location loc, mlir::SymbolRefAttr callee,
mlir::Type returnType, mlir::ValueRange operands,
llvm::ArrayRef<mlir::NamedAttribute> attrs = {}) {
- auto op = create<cir::CallOp>(loc, callee, returnType, operands);
+ auto op = cir::CallOp::create(*this, loc, callee, returnType, operands);
op->setAttrs(attrs);
return op;
}
@@ -315,7 +320,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value src, mlir::Type newTy) {
if (newTy == src.getType())
return src;
- return create<cir::CastOp>(loc, newTy, kind, src);
+ return cir::CastOp::create(*this, loc, newTy, kind, src);
}
mlir::Value createCast(cir::CastKind kind, mlir::Value src,
@@ -365,7 +370,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createBinop(mlir::Location loc, mlir::Value lhs,
cir::BinOpKind kind, mlir::Value rhs) {
- return create<cir::BinOp>(loc, lhs.getType(), kind, lhs, rhs);
+ return cir::BinOp::create(*this, loc, lhs.getType(), kind, lhs, rhs);
}
mlir::Value createLowBitsSet(mlir::Location loc, unsigned size,
@@ -387,8 +392,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value trueValue, mlir::Value falseValue) {
assert(trueValue.getType() == falseValue.getType() &&
"trueValue and falseValue should have the same type");
- return create<cir::SelectOp>(loc, trueValue.getType(), condition, trueValue,
- falseValue);
+ return cir::SelectOp::create(*this, loc, trueValue.getType(), condition,
+ trueValue, falseValue);
}
mlir::Value createLogicalAnd(mlir::Location loc, mlir::Value lhs,
@@ -403,8 +408,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createMul(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
OverflowBehavior ob = OverflowBehavior::None) {
- auto op =
- create<cir::BinOp>(loc, lhs.getType(), cir::BinOpKind::Mul, lhs, rhs);
+ auto op = cir::BinOp::create(*this, loc, lhs.getType(), cir::BinOpKind::Mul,
+ lhs, rhs);
op.setNoUnsignedWrap(
llvm::to_underlying(ob & OverflowBehavior::NoUnsignedWrap));
op.setNoSignedWrap(
@@ -422,8 +427,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createSub(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
OverflowBehavior ob = OverflowBehavior::Saturated) {
- auto op =
- create<cir::BinOp>(loc, lhs.getType(), cir::BinOpKind::Sub, lhs, rhs);
+ auto op = cir::BinOp::create(*this, loc, lhs.getType(), cir::BinOpKind::Sub,
+ lhs, rhs);
op.setNoUnsignedWrap(
llvm::to_underlying(ob & OverflowBehavior::NoUnsignedWrap));
op.setNoSignedWrap(
@@ -444,8 +449,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createAdd(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
OverflowBehavior ob = OverflowBehavior::None) {
- auto op =
- create<cir::BinOp>(loc, lhs.getType(), cir::BinOpKind::Add, lhs, rhs);
+ auto op = cir::BinOp::create(*this, loc, lhs.getType(), cir::BinOpKind::Add,
+ lhs, rhs);
op.setNoUnsignedWrap(
llvm::to_underlying(ob & OverflowBehavior::NoUnsignedWrap));
op.setNoSignedWrap(
@@ -466,7 +471,7 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
cir::CmpOp createCompare(mlir::Location loc, cir::CmpOpKind kind,
mlir::Value lhs, mlir::Value rhs) {
- return create<cir::CmpOp>(loc, getBoolTy(), kind, lhs, rhs);
+ return cir::CmpOp::create(*this, loc, getBoolTy(), kind, lhs, rhs);
}
mlir::Value createIsNaN(mlir::Location loc, mlir::Value operand) {
@@ -475,7 +480,8 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
mlir::Value createShift(mlir::Location loc, mlir::Value lhs, mlir::Value rhs,
bool isShiftLeft) {
- return create<cir::ShiftOp>(loc, lhs.getType(), lhs, rhs, isShiftLeft);
+ return cir::ShiftOp::create(*this, loc, lhs.getType(), lhs, rhs,
+ isShiftLeft);
}
mlir::Value createShift(mlir::Location loc, mlir::Value lhs,
@@ -553,12 +559,12 @@ class CIRBaseBuilderTy : public mlir::OpBuilder {
/// Create a loop condition.
cir::ConditionOp createCondition(mlir::Value condition) {
- return create<cir::ConditionOp>(condition.getLoc(), condition);
+ return cir::ConditionOp::create(*this, condition.getLoc(), condition);
}
/// Create a yield operation.
cir::YieldOp createYield(mlir::Location loc, mlir::ValueRange value = {}) {
- return create<cir::YieldOp>(loc, value);
+ return cir::YieldOp::create(*this, loc, value);
}
};
diff --git a/clang/lib/CIR/CodeGen/CIRGenBuilder.h b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
index f17657e4d304f..360f65e329ed6 100644
--- a/clang/lib/CIR/CodeGen/CIRGenBuilder.h
+++ b/clang/lib/CIR/CodeGen/CIRGenBuilder.h
@@ -291,7 +291,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
// Creates constant nullptr for pointer type ty.
cir::ConstantOp getNullPtr(mlir::Type ty, mlir::Location loc) {
assert(!cir::MissingFeatures::targetCodeGenInfoGetNullPointer());
- return create<cir::ConstantOp>(loc, getConstPtrAttr(ty, 0));
+ return cir::ConstantOp::create(*this, loc, getConstPtrAttr(ty, 0));
}
mlir::Value createNeg(mlir::Value value) {
@@ -300,7 +300,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
// Source is a unsigned integer: first cast it to signed.
if (intTy.isUnsigned())
value = createIntCast(value, getSIntNTy(intTy.getWidth()));
- return create<cir::UnaryOp>(value.getLoc(), value.getType(),
+ return cir::UnaryOp::create(*this, value.getLoc(), value.getType(),
cir::UnaryOpKind::Minus, value);
}
@@ -312,8 +312,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
mlir::Value createFloatingCast(mlir::Value v, mlir::Type destType) {
assert(!cir::MissingFeatures::fpConstraints());
- return create<cir::CastOp>(v.getLoc(), destType, cir::CastKind::floating,
- v);
+ return cir::CastOp::create(*this, v.getLoc(), destType,
+ cir::CastKind::floating, v);
}
mlir::Value createFSub(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
@@ -321,7 +321,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Sub, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Sub, lhs, rhs);
}
mlir::Value createFAdd(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
@@ -329,21 +329,21 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Add, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Add, lhs, rhs);
}
mlir::Value createFMul(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
assert(!cir::MissingFeatures::metaDataNode());
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Mul, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Mul, lhs, rhs);
}
mlir::Value createFDiv(mlir::Location loc, mlir::Value lhs, mlir::Value rhs) {
assert(!cir::MissingFeatures::metaDataNode());
assert(!cir::MissingFeatures::fpConstraints());
assert(!cir::MissingFeatures::fastMathFlags());
- return create<cir::BinOp>(loc, cir::BinOpKind::Div, lhs, rhs);
+ return cir::BinOp::create(*this, loc, cir::BinOpKind::Div, lhs, rhs);
}
Address createBaseClassAddr(mlir::Location loc, Address addr,
@@ -353,8 +353,9 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
return addr;
auto ptrTy = getPointerTo(destType);
- auto baseAddr = create<cir::BaseClassAddrOp>(
- loc, ptrTy, addr.getPointer(), mlir::APInt(64, offset), assumeNotNull);
+ auto baseAddr =
+ cir::BaseClassAddrOp::create(*this, loc, ptrTy, addr.getPointer(),
+ mlir::APInt(64, offset), assumeNotNull);
return Address(baseAddr, destType, addr.getAlignment());
}
@@ -389,8 +390,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
mlir::Value createComplexRealPtr(mlir::Location loc, mlir::Value value) {
auto srcPtrTy = mlir::cast<cir::PointerType>(value.getType());
auto srcComplexTy = mlir::cast<cir::ComplexType>(srcPtrTy.getPointee());
- return create<cir::ComplexRealPtrOp>(
- loc, getPointerTo(srcComplexTy.getElementType()), value);
+ return cir::ComplexRealPtrOp::create(
+ *this, loc, getPointerTo(srcComplexTy.getElementType()), value);
}
Address createComplexRealPtr(mlir::Location loc, Address addr) {
@@ -404,8 +405,8 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
mlir::Value createComplexImagPtr(mlir::Location loc, mlir::Value value) {
auto srcPtrTy = mlir::cast<cir::PointerType>(value.getType());
auto srcComplexTy = mlir::cast<cir::ComplexType>(srcPtrTy.getPointee());
- return create<cir::ComplexImagPtrOp>(
- loc, getPointerTo(srcComplexTy.getElementType()), value);
+ return cir::ComplexImagPtrOp::create(
+ *this, loc, getPointerTo(srcComplexTy.getElementType()), value);
}
Address createComplexImagPtr(mlir::Location loc, Address addr) {
@@ -463,9 +464,9 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
useVolatile ? cir::IntType::get(storageType.getContext(),
info.volatileStorageSize, info.isSigned)
: storageType;
- return create<cir::SetBitfieldOp>(
- loc, resultType, dstAddr.getPointer(), storageType, src, info.name,
- info.size, offset, info.isSigned, isLvalueVolatile,
+ return cir::SetBitfieldOp::create(
+ *this, loc, resultType, dstAddr.getPointer(), storageType, src,
+ info.name, info.size, offset, info.isSigned, isLvalueVolatile,
dstAddr.getAlignment().getAsAlign().value());
}
@@ -481,7 +482,7 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
useVolatile ? cir::IntType::get(storageType.getContext(),
info.volatileStorageSize, info.isSigned)
: storageType;
- return create<cir::GetBitfieldOp>(loc, resultType, addr.getPointer(),
+ return cir::GetBitfieldOp::create(*this, loc, resultType, addr.getPointer(),
storageType, info.name, info.size, offset,
info.isSigned, isLvalueVolatile,
addr.getAlignment().getAsAlign().value());
|
This patch updates `CIRGenBuilderTy` and `CIRBaseBuilderTy` to use `Op::create` for creating CIR operations. Compared to the new way which calls `OpBuilder::create` to create operations, the new way is more friendly to language servers and developers.
Lancern
force-pushed
the
cir/builder-op-create
branch
from
2937d72 to
dc46a49
Compare
andykaylor
approved these changes
Aug 20, 2025
Contributor
andykaylor
left a comment
andykaylor
left a comment
There was a problem hiding this comment.
Awesome! Thanks for handling this!
bcardosolopes
approved these changes
Aug 20, 2025
Member
bcardosolopes
left a comment
bcardosolopes
left a comment
There was a problem hiding this comment.
LGTM! Any chance you could backport this to incubator?
Member
Author
Yes, I will backport this later. |
Lancern
added a commit
to Lancern/clangir
that referenced
this pull request
Aug 21, 2025
This patch backports llvm/llvm-project#154540 to the incubator.
Lancern
added a commit
to Lancern/clangir
that referenced
this pull request
Aug 21, 2025
This patch backports llvm/llvm-project#154540 to the incubator.
bcardosolopes
pushed a commit
to llvm/clangir
that referenced
this pull request
Aug 21, 2025
…1848) This patch backports llvm/llvm-project#154540 to the incubator.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch updates
CIRGenBuilderTyandCIRBaseBuilderTyto useOp::createfor creating CIR operations. Compared to the new way which callsOpBuilder::createto create operations, the new way is more friendly to language servers and developers.